Copyright: Copyright (c) 1994-1996 by Olga Golosovker


About Shareware distribution

This program  is NOT free or public domain software. This is SHAREWARE, i.e., copyrighted software which you can "try before you buy". If you try a Shareware program and continue using it, you are expected to register.Shareware is a distribution method, not a type of software. You should find software that suits your needs and pocketbook, whether it's commercial or Shareware. The Shareware system makes fitting your needs easier, because you can try before you buy. And because the overhead is low, prices are low also. Shareware has the ultimate money-back guarantee -- if you don't use the product, you don't pay for it.

So, What is the difference between the Registered and Unregistered versions?

Functionally there is no difference - it's the same program with the same features. Just one thing - you can't use the unregistered version forever.  The evaluation version allows you to execute the program only 100 times. After that you will not be able to use the software. If you like the program and want to continue using it you are required to register.


ASP Ombudsman statement

  This program is produced by a member of the Association of Shareware Professionals (ASP). ASP wants to make sure that the shareware principle works for you. If you are unable to resolve a shareware-related problem with an ASP member by contacting the member directly, ASP may be able to help. The ASP Ombudsman can help you resolve a dispute or problem with an ASP member, but does not provide technical support for members' products.

Please write to the :

ASP Ombudsman at 545 Grover Road,

Muskegon, MI 49442-9427 USA,

FAX 616-788-2765

or send a CompuServe message via CompuServe Mail to :

ASP Ombudsman 70007,3536.


Auto-Walk Mode

   Auto-Walk mode allows you speed up the merging process by automatic advancing the merged files. Each time you select a colored segment the program will jump to the next section saving you from manual scrolling.


Command line

   Certain options can be specified in the command line upon the program start. This feature allows for greater flexibility and speeds up the process of merging. Here is the list of options which can be specified in the command line:

•	-d1 <dir name>

Starting directory for the left file open dialog (overrides INI file settings)

•	-d2 <dir name>

Starting directory for the right file open dialog (overrides INI file settings)

•	-f1 <file name>

Loads file <file name> into the left window. If the file name does not contain the full path it would be searched  in the following places:

current directory

the directory specified by -d1 option (or the directory specified in the INI file if -d1 option is not present).

•	-f2 <file name>

Loads file <file name> into the right window. If the file name does not contain the full path it would be first searched  in the current directory, then in the directory specified by -d2 option (or in the directory specified in the INI file if -d2 option is not present).

If both -f1 and -f2 are specified the files will be compared automatically right after being loaded.

•	-outf <file name>

Output results to file <file name>

•	-outd <dir name>

Use <dir name> as default output directory name

Command line usage example:

      vmerge -d1 c:\temp -f1 file1.txt -f2 c:\misc\file2.txt

      Loads files c:\temp\file1.txt and c:\misc\file2.txt and compares them.


Contents

Visual Merge is a tool you can use to compare and merge two files.

To learn how to use Help, press F1.

General

What is Visual Merge?

What is new in this version(since version 1.26)?

Distribution terms

Technical support

How to Register?

How To...

Find differences

Merge files

Merge directories

Commands and Keyboard

File menu commands

Search menu commands

Select menu commands

Options menu commands

Keyboard

Customizing your application

Initialization file

Customizing File Filters


Customizing File Filters

   You can change the set of filters which are used by file open / save dialog boxes throughout the program and define the default filter. All these options are defined in the [Filters] section of   VMERGE.INI . Each filter is described by two lines:

      Description <flt number> = <filter description>

      Filter <flt number> = <filter mask>

where <flt number> is the filter id number ranging from one up to the number of filters, <filter description> is a text (comment), associated with the filter and <filter mask> is a comma-separated list of the filters. You should also provide the number of filters in the following form:

      Filters number = <number of filters>

See also:  Initialization file


Distribution terms

About Shareware distribution

License agreement

ASP Ombudsman statement


File menu commands

File menu items depend on the current working mode. If you are comparing files (normal mode) File menu will contain the following entries:

•	         File 1 - for choosing the first file name

•	         File 2 - for choosing the second file name

•	         Diff   - displays files differences

•	         Write  - writes the results

•	         Print  - prints the combined version

•	         Quit   - just this.

However, in directory comparison mode this menu will have different contents:

•	         Skip     - skip current file and continue comparing

•	         Cancel - stops directory comparison and returns to the normal mode

•	         Write  - writes the results and proceeds to the next file

•	         Print  - prints the combined version

•	         Quit   - just this.


Find differences

To calculate and display differences between two files you should perform following steps:

•	    Open files to be merged. The files will be displayed in file panes. Vmerge will enumerate file lines if "Line Numbers" option is selected.

•	    Select Diff from File menu or press Ctrl+D. The program will calculate the differences and color the differing sections of both files in two colors - green and yellow. Yellow lines are blank lines that have to be added to the file to match the segment in the second file. Lines are colored green if the matching lines of the second file either differ or are missing at all (in the last case lines of the second file are yellow). Vmerge shows you the relative positions of the differing segments in the Position Bar

After performing these steps you will be able to print or save the results


How to Register?

   There are three types of licences: single-user, site and world-wide. Single user licence limits the usage of the program to a single computer at any given time. Site licenses cover a single organization for an area of up to one hundred miles (160 km) in radius. A world-wide license covers everyone in a single organization. Please observe and verify the total of your payment as you select licenses.

   To register your copy of VMERGE, please run REGISTER.EXE provided with the program. If you did not receive it in your package please contact the author. REGISTER.EXE will help you to fill the order form

which should be faxed or e-mailed to Kagi Shareware. REGISTER.EXE comes with online help explaining the registration procedure in details. Note that Kagi is only a processing service so any questions related to the product itself should be directed to the author.

   The license fee may be paid by check, money order, cash, VISA, MasterCard, American Express or First Virtual.

   If you wish to pay by check in an envelope you are advised to send it directly to the author(see the form below). In this case the processing time will be shorter.

   The program may be delivered by e-mail or by snail mail. In the latter 	case you should add a postal fee.

   Please check your delivery address.

IMPORTANT:  As a registered user you will receive the latest version of the program and future releases.

The following information regards only users wishing to register directly with the author. Please fill the form below, attach a check in US dollars payable to Olga or Victor Golosovker and send it to the following address:

   V.Golosovker,

   16/10 Havacelet,

   Nesher,

   Israel 36731.

=============    ORDER     FORM   ==========================

Name: _____________________________________________________

Company: __________________________________________________

Address: ___________________________________________________

__________________________________________________________

Tel/Fax: ___________________________________________________

  Please accept this registration fee for VMERGE v1.27.

  Please send me (check the box) :

  [ ]  Diskette with the program by mail.

[ ] Please, send me 3 1/2" diskette

[ ] Please, send me 5 1/4" diskette

  [ ]  The program by e-mail (address attached).

        Internet E-mail:  ______________________________

  ________________________________________     _______________

SIGNED                                       DATE

  Registration fee:

   Single-user licence :  $ 25.00	_____

   Site        licence :             $ 200.00  _____

   World-wide  licence :  $ 2000.00 _____

  Postal fee (if applicable):    $10  _____

TOTAL      $ _______

============== END  ORDER   FORM   ==========================


Initialization file

   Initialization file is used to store the last program state so VMERGE will start next time with the same options and in the same directory. This file (VMERGE.INI) should be present in your Windows directory. It contains the following sections:

•	[Options] - general options.

Keys:

Tab size = xxx - sets tab size to xxx

Auto walk = 0 or 1  - Auto-Walk Mode(off/on)

Compress spaces = 0 or 1 - treats any number of adjacent white spaces as a single one during file comparison (off or on)

Line numbers = 0 or 1 - display line numbers (off or on)

•	[Files] - directories options

Keys:

Dir name 1 = <dir name> - starting directory for the left file open dialog

Dir name 2 = <dir name> - starting directory for the right file open dialog

Out dir = <dir name> = initial output directory

Current index 1 = xxx - set default filter for the left open dialog to filter number xxx (See Customizing File Filters).

Current index 2 = xxx - set default filter for the right open dialog to filter number xxx (See Customizing File Filters).

Save index = xxx - set default filter for the file save dialog to filter number xxx (See Customizing File Filters).

•	[Filters] - file name filters. See Customizing File Filters section


Keyboard

•	     Ctrl+F1 - load left file

•	     Ctrl+F2 - load right file

•	     Ctrl+D  - display files differences

•	     Ctrl+W  - write out the results.

•	     Ctrl+N  - Next differing section

•	     Ctrl+P  - Previous differing section

•	     Ctrl+F  - Font selection box

•	     Ctrl+T  - Tab size selection

•	     PgDown  - Next screen

•	     PgUp    - Previous screen

•	     Ctrl+PgDown  - Jump to the file end

•	     Ctrl+PgUp    - Jump to the file beginning

•	    Alt+S   - Skip to the next file (directory comparison)

•	    Alt+C   - Cancel directory comparison.


License agreement

 TRIAL USE LICENSE

   VMERGE is NOT a public domain program.  It is copyrighted by

   Victor Golosovker.  This software and accompanying documentation are

   protected by United States copyright law and also by international

   treaty provisions.

   Victor Golosovker grants you a limited license to use this software

   for evaluation purposes for a period not to exceed 100 program

   executions. If you continue using this software after the

   evaluation period, you MUST make a registration payment to Victor

   Golosovker.

   You may not use, copy, rent, lease, sell, modify, decompile,

   disassemble, otherwise reverse engineer, or transfer the licensed

   program except as provided in this agreement.  Any such unauthorized

   use shall result in immediate and automatic termination of this license.

   All rights not expressly granted here are reserved to Victor Golosovker.

LIMITED DISTRIBUTION LICENSE

   Permission is granted to individuals charging no fees, and to BBSes,

   User Groups, Mail-Order Disk Vendors, CD-ROM publishers, and BBS

   File-Distribution Networks regardless of fees, to distribute

   VMERGE , provided they convey a complete and unaltered copy of

   the shareware version of this product, and provided they claim no

   ownership of these products.

   Distribution by other channels, and distribution of modified versions,

   are also allowed, but only under the terms of the attached VMERGE data

   record, which is hereby incorporated by reference. Any distribution

   satisfying all the distribution requirements expressed in that data

   record is hereby authorized.

   Permission to distribute the VMerge package is not transferable,

   assignable, saleable, or franchisable.  Each vendor wishing to

   distribute the package must independently satisfy the terms of this

   limited distribution license.

   U.S. Government Information:  Use, duplication, or disclosure by the

   U.S. Government of the computer software and documentation in this

   package shall be subject to the restricted rights applicable to

   commercial computer software as set forth in subdivision (b)(3)(ii) of

   the Rights in Technical Data and Computer Software clause at

   252.227-7013 (DFARS 52.227-7013).  The Contractor/manufacturer is

   Victor Golosovker, Havacelet 16/10, Nesher, Israel 36731.

   Victor Golosovker may revoke any permissions granted here, by

   notifying you in writing.  All rights not expressly granted here are

   reserved to Victor Golosovker.

LIMITED WARRANTY

   THIS SOFTWARE AND MANUAL ARE PROVIDED FOR EVALUATION ONLY, ON AN "AS

   IS" BASIS.  THE AUTHOR DISCLAIMS ALL WARRANTIES RELATING

   TO THIS SOFTWARE, WHETHER EXPRESSED  OR IMPLIED, INCLUDING BUT NOT

   LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR

   A PARTICULAR PURPOSE. NEITHER THE AUTHOR NOR ANYONE ELSE

   WHO HAS BEEN INVOLVED IN THE CREATION, PRODUCTION, OR DELIVERY OF

   THIS SOFTWARE SHALL BE LIABLE FOR ANY INDIRECT, CONSEQUENTIAL, OR

   INCIDENTAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE SUCH

   SOFTWARE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE

   POSSIBILITY OF SUCH DAMAGES OR CLAIMS.  THE PERSON USING THE SOFTWARE

   BEARS ALL RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE.

   This agreement shall be governed by the laws of the State of Israel

   and shall inure to the benefit of the author and any

   successors, administrators, heirs and assigns. Any action or proceeding

   brought by either party against the other arising out of or related to

   this agreement shall be brought only in FEDERAL COURT of

   competent jurisdiction located in Israel. The parties

   hereby consent to in personam jurisdiction of said courts.


Merge directories

   Select "Compare Directories" in File menu. Vmerge will prompt you for first, second and target directories. The program will compare the files in the first directory against the second directory.

If the same version of a file is present in both places or file with a certain name is found only in one directory, the program will copy it to the destination directory. If two files with the same name but different contents are present in compared directories, they will be displayed side by side just as if you were comparing files in normal mode. The only difference is the changed File menu.

To proceed without merging the current file you should select Skip in the File menu.

If you want to stop comparing the directories you should choose Cancel.

To merge the current file you should resolve all the differences and write the result to the disk (see Merge files section). After saving the merged version the program will proceed to the next file.


Merge files

To combine two files you will first have to Find differences. The program will display all differing segments side by side. For each of these sections you will have to select either left or right version by clicking left mouse button over the colored text. Selected segments will change their color to blue. After having resolved all the file differences you will be able to save or print the resulting version.


Options menu commands

•	         Compress spaces - instructs to consider a sequence of white spaces as a single space

•	         Line Numbers - displays line numbers along with text

•	         Tab size     - sets new tab size

•	         Auto walk    - toggles the Auto-Walk Mode

•	         Font         - selects font

•	         Title Font   - selects title font


Position Bar

   Vmerge allows you to see the relative positions of the differing segments all at once. Each segment is represented by a mark in the Position Bar (two columns around the vertical scrollbar in the center). You can quickly scroll the file pane to a certain segment by simply positioning the scrollbar against the appropriate mark.


Search menu commands

•	        Next      - go to the next differing segment

•	         Previous  - go to the previous differing segment

•	         First     - go to the first differing segment

•	         Last      - go to the last differing segment

•	         Beginning - go to the first line

•	         End       - go to the last line


Select menu commands

•	         From Left    - chooses all the unresolved differences from the left file

•	         From Right   - unresolved segments are taken from the right file

•	         Unselect All - dismiss all the choices made so far


Technical support

   Technical support will be available via mail or e-mail for registered users only. User who submits a bug report(including all needed accompanying files and procedures to reproduce the bug) during the first 90 days after his registration will receive a satisfying solution to the problem or full refund of the registration fee. Beyond the 90 days period the author is not obligated to refund the user, though the best efforts will be made to fix reported bugs. To get the support please contact the author:

   By e-mail:

      victor@kagi.com         or

      victor@rotem.technion.ac.il

   By mail:

      Olga or Victor Golosovker,

      16/10 Havacelet,

      Nesher,

      Israel 36731.


What is new in this version(since version 1.26)?

•	The setttings are preserved when you exit the program

•	Current directory is remembered when you exit

•	Directory comparison (non-recursive)

•	Auto-Walk Mode

•	User-defined file filters in file open/save dialog

•	Some options can be specified in the Command line

•	Position Bar added

•	3D look for controls (using ctl3dv2.dll)


What is Visual Merge?

    VMERGE is an easy to use program designed to help people in merging files. Those who have tried once to combine two similar versions of a program know how difficult it is. There are always some lines which get forgotten or misplaced.

    There are some utilities for comparing files and producing list of differences between them, but these programs will often scarcely help, because one should still perform merging manually, cutting lines alternately from both of the files. On the other hand, there are programs that can create a third file based on two version, but they are either too primitive or too complex for everyday use.

   VMERGE makes file merging much easier by letting you to choose between the differing segments by a single mouse click. Its intuitive interface and other features allow you to minimize manual postprocessing thus saving your time.

   The program comes in two versions - 16 bit and 32 bit. The former is limited to files shorter than 64 K, while the latter imposes no size limits, supports long file names and may be run on Windows NT, Windows 95 or Windows 3.1 with Win32s installed (Win32s is freely distributed by Microsoft and may be downloaded from ftp.microsoft.com).

 Visual Merge is not a FreeWare nor a Public Domain.

 VMERGE  is ShareWare, copyright (c) 1994-1996  by Olga and Victor Golosovker. Please, support the ShareWare concept and register your copy

 The author will be thankful for any comments, suggestions and bug reports.